Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Tue, 7 Jan 2014 14:32:45 +0000 (14:32 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 7 Jan 2014 14:32:45 +0000 (14:32 +0000)
commitcc0a6c6c749a8693dc0e201773c10cd97e5e6ce0
treeb6a517e4a89f8b1594a1299b180ec45b98423f85
parent4746b5adc396bb2fc963b3156eab7267c6e7e541
parent81b1c7de2339d2788352b162057e70130803f3cf
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging